fixed wrong g_convert_with_fallback() call which caused

2007-04-14  Yevgen Muntyan <muntyan@tamu.edu>

	* gtk/gtkselection.c (selection_get_text_plain): fixed
	wrong g_convert_with_fallback() call which caused
	gtk_selection_data_get_text() return invalid UTF-8 for
	non-ASCII text in text/plain selection (#382824).

svn path=/trunk/; revision=17600

diff --git a/ChangeLog b/ChangeLog
index c933d8c41c9b83169e2222e4edad9807d65aeec4..667fe1630bf4cf9777767b9efc1fdb25342150fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-14  Yevgen Muntyan <muntyan@tamu.edu>
+
+       * gtk/gtkselection.c (selection_get_text_plain): fixed
+       wrong g_convert_with_fallback() call which caused
+       gtk_selection_data_get_text() return invalid UTF-8 for
+       non-ASCII text in text/plain selection (#382824).
+
 2007-04-12  Jakub Steiner <jimmac@ximian.com>
 
        * gtk/stock-icons/*: update the stock icons to follow the Tango

diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index ed40d7555810a34f2866fe7fced0170a4db8c00a..b76090be200499f7ef0b1e96d4157ee2b7d7d56a 100644 (file)
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1310,7 +1310,7 @@ selection_get_text_plain (GtkSelectionData *selection_data)
     {
       gchar *tmp = str;
       str = g_convert_with_fallback (tmp, len, 
-                                    charset, "UTF-8", 
+                                    "UTF-8", charset,
                                     NULL, NULL, &len, &error);
       g_free (tmp);